Fix for an Issue #772