Make the regex a bit more failsave