Fix for an Issue #831