Make safe (16/36)

Make safe