Make safe (10/36)

Make safe