Make safe (4/36)

Make safe