Fixed editing core