fix #1194
Merge pull request #1219 from teravest/issue1194

fix #1194