fix attempt #3654
Merge pull request #3671 from bilalyasar/fix-3654

fix attempt #3654