Tweak the firing logic a bit