fix duplicate issue
