#192 regex matching fix