[#82904384] Tweak subscription code.