Fixed duplicate entry issue