Tries to fix Heroku timeout