Attempt to fix the friends issue