Fix Regex again