this fixes #10
this fixes #11