Fix to CDSP fix and Leaping Panther