regexp changed, passes tests now