fixed move resetting current