* fixed sorting issue