bugfixinf for version 0.8