Fixed bug MRN-607

Change-Id: I2595db346495071d2094f85439fca3d0fd28ec21