Fixing #87