Fix extend helper