Fix inheritance