Fixed interrupt handling