diff --git a/pystencils/kernelcreation.py b/pystencils/kernelcreation.py
index 43b239ef592e0ebf77d759c5321d0e153562e546..613050544ebf8fec100bb76bfebc9208cbb239e6 100644
--- a/pystencils/kernelcreation.py
+++ b/pystencils/kernelcreation.py
@@ -76,6 +76,9 @@ def create_kernel(assignments,
                [0., 4., 4., 4., 0.],
                [0., 0., 0., 0., 0.]])
     """
+    #save the original assignments
+    assign = assignments
+    
     # ----  Normalizing parameters
     split_groups = ()
     if isinstance(assignments, AssignmentCollection):
@@ -130,7 +133,8 @@ def create_kernel(assignments,
     if use_auto_for_assignments:
         for a in ast.atoms(SympyAssignment):
             a.use_auto = True
-    ast.assignments = assignments
+    ast.assignments = assign
+    ast.indexFields = False
 
     return ast
 
@@ -181,6 +185,9 @@ def create_indexed_kernel(assignments,
                [0. , 0. , 0. , 4.3, 0. ],
                [0. , 0. , 0. , 0. , 0. ]])
     """
+    assign = assignments
+    indF = index_fields
+    
     if isinstance(assignments, Assignment):
         assignments = [assignments]
     elif isinstance(assignments, AssignmentCollection):
@@ -213,7 +220,8 @@ def create_indexed_kernel(assignments,
     else:
         raise ValueError("Unknown target %s. Has to be either 'cpu' or 'gpu'" % (target,))
 
-    ast.assignments = assignments
+    ast.assignments = assign
+    ast.indexFields = indF
     return ast