fixed sorting again