Fix inheritance issue

Change-Id: Iebcbf9b7d03ab7a14ff285dad58f75be0f829daa