EZP-21599: fixed on-interrupt implementation