Resolved bug MRN-655

Change-Id: I6628728b2f1fadb6af41b1b8366224689236fa98