fixes #82 and #86