Fix for Issue #717