Fixing the moves count issue