Fix forgotten selfs