fixes #12 fixes #8