sorting issue fixed