APOLLO-2645 Updated regex to actually work