fix 1.0
fix edit 1.1