Memory fix (9/13)

Memory fix