safety changes #18

Closed mi-cichon closed 2 years ago