Fixed duplicate entries