Fixes - #3370 - organization and location commands fail
Merge pull request #33 from mbacovsky/3370_orgs_fail

Fixes - #3370 - organization and location commands fail