Finish issue #78, variables in interrupt handlers