Fix for Issue #38