fix bug @announcement]