Not tested locally due to Heroku freezing, but let's try it on Travis