This fixes #8