Fixed #2 a few commits ago, this fixes #8 and fixes #9