Fixed generic class inheritance