made fix as per sprint 2 task #DSC-232