[*] Fix for killing long intervals and timeouts