Fix moving avatar issue