This fixes #88