Fix for Issue #579