Logging fixed

Change-Id: Ic58e8540b7348dafefc43e75d15bbac426a54b19