fixes #6 and #7