not working on heroku - bugfix