fixes #6531