FIX: handling of @org@