Fix bug on leave_orig