Slight avi unbreak from last change.