Fix possible loop