Fixes #88
Fixes #88