fix base edit