Better fix for buffer overrun