Updated fix for Issue #79