Move counter fix