Hackish fix for regexps, they still need be properly fixed