Fixes #7095
Merge pull request #7140 from mwerezak/sayfix

Fixes #7095