fixes #119, fixes #118