Fix move (16/32)

Fix move