Productively fixed important code hygene issue

Change-Id: I1f46cab0d53b01963d5204bf04819083b1a8a4f6