closes #80, fixes #82