Better logging for Issue #38