fixes #6488