Fixed: use instance var