Fix for an Issue #838