Yet another moves sorting fix