Fix for an Issue #793