Make somewhat safer