Attempt bug fix for Sampleset model when running on Heroku