Fix order del/save issue;