[CDE-211] Fixed issue