this fixes #8
this fixes #9