Working bug fix with other gemfile changes