Fix reply assignment problems after merge