Edit bug fix