Fixes #6807

Fixes #6807