Resolve Issue #5822