Fixes #5586

Fixes #5586