fix up extend