Fixed self issue