fix issue 1022
fix issue 1022
Merge pull request #1045 from ahmetmircik/maintenance-3.x

fix issue #1022