Merge "Fix a log message"