+ Fixed duplicate entries