Fix for an Issue #887