Fix 7197

Closes #7197.