Fix bug as result of conflict for state sending.