Memory fix (7/13)

Memory fix