Issue #6921 Big fix