Fix delaying announce until identified