Again, this fixes #7