fix issue #8102
Merge pull request #8135 from rmarchei/8102

fix issue #8102