fixes #5536