Try to fix sorting issue (not working)