Fixed RegEx for final pass