Modified the fix for Issue #81