fixup memory - again