Michael's patch implemented

Change-Id: I3f0802d5001172fc7b8409274bc5a3632e5dad34