Fixed bug with id editing