Fixing #88
Fixing #87