FIX avatar locations