Fix for Issue #34