XXX: fix move counter