Fix for #79854006 #79854478