Modified fix for Issue #81