Fixed handing of Raw streams