fixes #3 fixes #7