Friends bug fix