friend cell bug fix