fixes #6970