This fixes #7