Try to make work on heroku