Added missing "self" in function calls