Memory safe (18/20)

Memory safe