Fix for an Issue #862