more fixes #117