Fixes #6188

Fixes #6188