Fix control number sorting issue