Logging fixed

Change-Id: I3735d47bbcc7039e4ceb6dd3480ae48782ca9930