Avoid infinite loop in CRON
Code review, part one