Updating to regex from J3.3.x