Make safe (6/36)

Make safe