FriendHandler improved (bug fix)