Fix for an Issue #895