Fixes one, but not all of valgrinds warnings relating to this
Attach a file by drag & drop or click to upload
