change interrupt enable ordering