Fix 'self' variable pointing at Contoller object now.