diff --git a/modules/color.lua b/modules/color.lua
index 9ad6810..a83157c 100644
--- a/modules/color.lua
+++ b/modules/color.lua
@@ -293,8 +293,6 @@ function color_mt.__index(t, k)
 		if type(k) == "number" then
 			return t._c[k-1]
 		end
-	elseif type(k) == "number" then
-		return t._c[k]
 	end
 
 	return rawget(color, k)
@@ -304,9 +302,8 @@ function color_mt.__newindex(t, k, v)
 	if type(t) == "cdata" then
 		if type(k) == "number" then
 			t._c[k-1] = v
+			return
 		end
-	elseif type(k) == "number" then
-		t._c[k] = v
 	end
 
 	rawset(color, k, v)
diff --git a/modules/mat4.lua b/modules/mat4.lua
index 9370504..a1cff0d 100644
--- a/modules/mat4.lua
+++ b/modules/mat4.lua
@@ -651,6 +651,7 @@ function mat4_mt.__newindex(t, k, v)
 	if type(t) == "cdata" then
 		if type(k) == "number" then
 			t._m[k-1] = v
+			return
 		end
 	end