Logging fixed

Change-Id: I4aaaed4f338a72efbedd56e8df3339331cd4e6b0