fixes one final bug from #200 / #217
Merge pull request #218 from misterdorm/pr217fixes

fixes one final bug from #200 / #217