Fixed another sorting issue