Fix Stream Bug