fixes #6133