Made safe (18/38)

Made safe