Removed duplication bug