Updated both regex patterns to handle this edge case

Updated both regex patterns to handle this edge case #2009