Fix extend