Merge "cron fix"