fix extend