another move ordering fix