Autoscan - small improvement...

Worker can die...