fixes #5585