Fixes #6985

Fixes  #6985