Fix parent class limitation treatment