Fix #217
Merge pull request #388 from mobileka/fix-217

Fix #217