I believe this fixes #8