fix issue #1068
fix issue #1068 cont
Merge pull request #1103 from ahmetmircik/fix1068

fix issue #1068