Fix the issue with friendship