Fix for using harvesters with organization setup