Fix up the extend