More permissive regex. Again.

Hope I didn't miss anything...