[#8536] improve safety
5 files changed