Fix inheritance

Change-Id: I361fd13423a7d625af34f2591d8fbfcab2ed5cb4