fixes #5020