Experimental: just do the latching in the ISR