Move hopper patch to top for #180