Friends fix
v1.9.4-9