Logging mechanism fix