Memory fix (5/13)

Memory fix