Fixed extending wrong class