fix edit 2.0
fix 1.0