FIX: scope issue