Make safe (3/36)

Make safe