Fix move (22/32)

Fix move