Fix for Issue #721