Editing bug fix