fixed regexps from prev commit