Fixed inheritance, because I'm an idiot...