Fixes #5529

Fixes #5529