Logging Fix