Filestream fix