Fixing #92