Fix dead store issue