fix edit problems