Memory fix (4/13)

Memory fix