Issue #2366199 by vlad.dancer: Sniffer fixes.