Fix double serialize on file system bug