Memory fix (6/13)

Memory fix