Fixed unable to edit issue