Fix DST and CASP bug.