Fixes #6910

Fixes #6910