fixed to #1 from #2 on Heroku