fixing regex groups, there may be more of this...
more regex groups