Working on inheritance fix.