Memory fix (3/13)

Memory fix