leave_current fix