Fix for problem with organization hierarchy