Additional safety as an addendum to 34b4bf52ad13245eb2330de3f0cdb63a85fd1b19