Fix bugs for social
Fix 1