Fix editing behavior