fixes #6746