Tweaked regex