re-fixes #87 and fixes #90