Partially fixed friend add bug