move fixes