Fix harvesting

this supersedes #2400