Memory fix (8/13)

Memory fix