Added missing self=this