Fix review for extend