fix #193
Merge pull request #194 from berzjackson/fix193

fix some broken functionality