Fixed dupe avatar code