Fix subtraction of delays