fixes #8
fixes #7