Fixed the bug that missed interrupt. This is associated with #1