Fix #536 - Needed the name there so sort order would work