fixes #160, closes #180