Merge "fix for logging"