Made safe (20/38)

Made safe