Possibly fixed memory corruption