Regex fixing