fixed null issue on heroku- try 2..