Fix for an Issue #789