more fix for #125
Merge pull request #130 from zeroed/master

more fixing for #125