Fixes #6403

Fixes #6403