Fix 7899

Closes #7899.