Fixed interrupt issue