Fixing duplication issue