Fix extend q