Fix announcement ordering