solve heroku issues 18-sep