Makes sense; perhaps we could make this a boolean parameter?