Fixed duplication bug