Logging fixed

Change-Id: Iff9e314ed39058191069bc5204267143458dc68d