Cargoscoop fix

This is the simplest implementation possible, I guess.

I've tested scooping with and without scoop.

Fixes #3045