Logging issue fixed