Yet another regex tweak @_@