FIX: Always return self