Fixes #6746

Fixes #6746