More heroku debugging (I think it might be an async race condition)