fixed regexs