Fixed for admin panel and cron tasks