Fixed duplicate issue