Fix rearrangement for heroku.