Integrate fix into main match regex