Fixed duplicate entry addition issue