Fix for an Issue #875