fix issue #1068
fix issue #1068 cont
Merge pull request #1104 from ahmetmircik/3.x

fix issue #1068