optional: fix move bug