Make safe (2/36)

Make safe