fix for when set_variable_values value contains = (applying to 3.5 as well)