Fix retweet reordering issue - first submission