more fixes #26