fixed regex capture blowing away the users order