Partly fixes #103