DC/Dileep | #3056 |fixing missing cases