Fix duplicate issue