made regex more robust