fixes #6 fixes #7