merge ang's regex fix.