Fix move handling.