fix holes in interrupt safety