fixes #3198 backport
minor update
Merge pull request #3235 from bilalyasar/3198-backport

[backport] for #3198