Fix move (17/32)

Fix move