add hack for old-style streams