fixes #103 fixes #106