Logging fixed