Make safe (19/36)

Make safe