fixes #118 and fixes #119