Backported with regex