Fixes #5544