Fix bug in FileStore