Fixing a potential buffer issue
Fixing a potential buffer issue