Fixed to work with new Harvester