This commit make 'friends' work