Regex bug fix