additional fix for Jet and Stream.