fixes #6473
Merge pull request #6585 from Carreau/fixes-6473

fixes #6473