Fixing #98

Fixing #98