fix #7409

fix #7409
Merge pull request #7410 from tknopp/patch-2

fix #7409