Fixes #5549

Fixes #5549