Fix interrupt behavior