Fix the extend