Fixing #89