Experimental Heroku Fix