Fix move (21/32)

Fix move