diff --git a/WickedEngine/wiScene_Components.h b/WickedEngine/wiScene_Components.h
index 1b36c912c..aec866a61 100644
--- a/WickedEngine/wiScene_Components.h
+++ b/WickedEngine/wiScene_Components.h
@@ -2406,6 +2406,12 @@ namespace wi::scene
 					values.erase(values.begin() + lookup[name]);
 					names.erase(names.begin() + lookup[name]);
 					lookup.erase(name);
+
+					// reorder lookup
+					for (size_t i = 0; i < names.size(); ++i)
+					{
+						lookup[names[i]] = i;
+					}
 				}
 			}
 		};