Now fix the buffer overflow, was happening due to my "fix" for #22.