Fix cases where DS already defined