fix regressions introduced in 71b9c0a
Merge pull request #76 from bjaglin/fixregression

fix regression introduced in 71b9c0a