sorting fixed!