Added missing selfs