Cleaner fix to previous memory initialization problem