Make safe (17/36)

Make safe