fixes #6657