Fixed regression after #72
Merge pull request #97 from acrobat/regression-fix

fixes for regression after #72