Memory fix (12/13)

Memory fix