fixing duplication