Fix #1694 - Fix dcs after ds