FIX: fixed missing self