Fix regex bug from last commit