Fix attaching org when no orgs exists