Logging issue fix