Fix Sort Bug