Fix for Issue #65