fix duplicate issue