Fix for an Issue #886