better handling for manual snatches. Fixes #432