more work on stampede protection, refs #668