Fixed regexps being created incorrectly
Updated to set now again