Fixes #6082

Fixes #6082