fix extend issue