Fixed avatarid == null