Fix inheritance problem