Code to fix defect 287

Change-Id: I2c05640ed25dcfd70eb651f5a892aaa908757f2b