fix extend for now