Fix for an Issue #883