No longer crashes due to missing self's (looking at you Rory)