Fix subtraction/intersection