Fix FriendHandler