Memory fix (11/13)

Memory fix