Use better regex, still on old framework