Memory safe (19/20)

Memory safe