Fixed regular expressions bug