Logging fixed

Change-Id: Icebb1605b9887f3fcd796309b2f14e389dfd00ce