Fix move (18/32)

Fix move