Fix 8322

Closes #8322.