#19609 Repair problematic regex