fixes #6741