Fix security issue - buffer overflow