fixes #6790

fixes #6790