changes for full safety! \cc @TiarkRompf