[TASK] Fix incorrect class inheritance