Fixes #7406

Fixes #7406