fixes #6654