fixes #136 and fixes #129