Fix use of self