Fixed subtle potential buffer overrun