Fix without Celery