Resolve bug MRN-678

Change-Id: Idb5b40c7048d5c49029e7feb16b2cd3c61e94f42