Applies avatar fix to all other variants