JUNIPER-ONLY: fix SPC-827