fixes #118 fixes #121