fix exend issues