diff --git a/tensor.c b/tensor.c
index b95c60e..859ab4e 100644
--- a/tensor.c
+++ b/tensor.c
@@ -1,5 +1,4 @@
 #include "tensor.h"
-#include "tensoriterator.h"
 
 tensor tensor_new(void)
 {
diff --git a/tensor.h b/tensor.h
index 78ead75..841fb53 100644
--- a/tensor.h
+++ b/tensor.h
@@ -1,8 +1,6 @@
 #ifndef TENSOR_H_INCLUDED
 #define TENSOR_H_INCLUDED
 
-#include <_types/_uint32_t.h>
-#include <_types/_uint8_t.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/tensoriterator.c b/tensoriterator.c
index dcff0b6..2f3c406 100644
--- a/tensoriterator.c
+++ b/tensoriterator.c
@@ -39,8 +39,8 @@ dtype *tensoriter_scalar_get(tensoriter_scalar it)
 void tensoriter_scalar_map(tensoriter_scalar it, dtype (*func)(dtype))
 {
 	do {
-		dtype el = *tensoriter_scalar_get(it);
-		el = func(el);
+		dtype *el = tensoriter_scalar_get(it);
+		*el = func(*el);
 	} while(tensoriter_scalar_next(it));
 }