fixes #9
fixes #7