bugfix: use non-greey regexes