diff --git a/friends.py b/friends.py
index ce9b111..4f24d79 100644
--- a/friends.py
+++ b/friends.py
@@ -59,8 +59,6 @@ def add(sender, names):
 
   for name in names:
     player = server.getOfflinePlayer(name)
-    # FIXME: breaks if player not known
-    # FIXME: might to a blocking call, maybe we can use getOfflinePlayers()
     if known_player(player):
       player_id = uid(player)
       not_yourself = player != sender
diff --git a/misc.py b/misc.py
index e743d00..d91a82c 100644
--- a/misc.py
+++ b/misc.py
@@ -14,7 +14,7 @@ def on_join(event):
   player = event.getPlayer()
 
   # send welcome broadcast
-  if not server.getOfflinePlayer(player.getName()).hasPlayedBefore():
+  if not player.hasPlayedBefore():
     broadcast("utils.greet_new", "")
     broadcast("utils.greet_new", "&a&lPlease welcome &f" + player.getDisplayName() + " &a&lto Redstoner!")
     broadcast("utils.greet_new", "")