Logging fixed

Change-Id: I2a9aee222cebf52b953dca0cbe0559cfd4fd7704