Friend adapter fix