Tracking down more-then-one spoiler bug [ci skip]