Fixed regular exression to match new format