DB/SAI: Hampering their Escape

By @untaught fixes #10780