Fix extend class