better fix for #57
Merge pull request #82 from way2muchnoise/1.7-update

better fix for #57