Improvement to other avatar detection to help jeffrey's merge