diff --git a/inbox.py b/inbox.py
index 6149b3a4..943ad491 100644
--- a/inbox.py
+++ b/inbox.py
@@ -410,10 +410,8 @@ def receiveUndoFollow(session,baseDir: str,httpPrefix: str, \
         if portFollowing!=80 and portFollowing!=443:
             domainFollowingFull=domainFollowing+':'+str(portFollowing)
 
-    if not unfollowerOfPerson(baseDir,nicknameFollower,domainFollowerFull, \
-                              nicknameFollowing,domainFollowingFull, \
-                              federationList,debug)
-    return True
+    return unfollowerOfPerson(baseDir,nicknameFollower,domainFollowerFull, \
+                              nicknameFollowing,domainFollowingFull)
 
 def receiveUndo(session,baseDir: str,httpPrefix: str, \
                 port: int,sendThreads: [],postLog: [], \
diff --git a/tests.py b/tests.py
index 76186b41..0999b84f 100644
--- a/tests.py
+++ b/tests.py
@@ -1080,9 +1080,9 @@ def testClientToServer():
                                True)
     for t in range(10):
         if os.path.isfile(bobDir+'/accounts/bob@'+bobDomain+'/followers.txt'):
-            if 'alice@'+aliceDomain+':'+alicePort in open(bobDir+'/accounts/bob@'+bobDomain+'/followers.txt').read():
+            if 'alice@'+aliceDomain+':'+str(alicePort) in open(bobDir+'/accounts/bob@'+bobDomain+'/followers.txt').read():
                 if os.path.isfile(aliceDir+'/accounts/alice@'+aliceDomain+'/following.txt'):
-                    if 'bob@'+bobDomain+':'+bobPort in open(aliceDir+'/accounts/alice@'+aliceDomain+'/following.txt').read():
+                    if 'bob@'+bobDomain+':'+str(bobPort) in open(aliceDir+'/accounts/alice@'+aliceDomain+'/following.txt').read():
                         break
         time.sleep(1)