Fixes #5570