Fix inheritance

Change-Id: Ic94808ec0e6414af80b93d01ad34520aa55653ce