Do interrupt handling in more right way