Tweak regex expression