fixes #121 fixes #122