fix #1206
Merge pull request #1218 from teravest/issue1206

fix #1206