fixed regressions intorduced in 0.0.6
release 0.0.7