Fixed the FileStorage