Fix editing by bootstrapping