quick fix for inheritance problems

Change-Id: I41c5c937d62d6ba0b3df2d4a0101319f272495a7