More reliable regex