Fix bug with additional entries