Trick bundler, fix adapter patch for 3.1