Regex tweaked