Fixes #6702

Fixes #6702