Tweak regex again