*finally* fixes #88