Avainsana: improve safety