This fixes #145
This fixes #88