Memory fix (2/13)

Memory fix