Fix for Issue #64