Change the way regexps are evaluated (fix bug that occured after re-sorting)