fixes #6611