Fix #6518

Closes #6518