Fix spurious drops

Merged Gijs Peskens requested to merge fix_spurious_drops into master

Merge request reports