Fixed encoding live-edit