diff --git a/sql/table.cc b/sql/table.cc
index 1a82bcae73d..3588c114abc 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -2534,6 +2534,14 @@ static bool fix_value_generators_fields(THD *thd, TABLE *table,
                   nullptr);
 
 end:
+
+  Field **cur_ptr, *cur_field;
+  cur_ptr = table->field;
+  while((cur_field = *(cur_ptr++))){
+    if(cur_field->is_flag_set(GET_FIXED_FIELDS_FLAG)){
+        cur_field->clear_flag(GET_FIXED_FIELDS_FLAG);
+    }
+  } 
   table->get_fields_in_item_tree = false;
   thd->mark_used_columns = save_mark_used_columns;
   return result;