DA bug fix (looks reasonably correct).