Fix move (23/32)

Fix move