Fix implicit sorting