Fix possible overrun