fix for remote stream wrappers