Fixed: Regex issues