fixes #5630