Fix self -> this