fixes #6739