Using a different regex and fixed a crash