Fix for an Issue #884