Better logging for Issue #34