fixes #5890