drugiej bugfix

porting it from the unit-tests2 branch
roveru s/b roweru