fixes #6738