Fix issue MDEP-466