1 files changed, 4 insertions, 3 deletions

diff --git a/array.c b/array.c
index e333870..3ec8639 100644
--- a/array.c
+++ b/array.c
@@ -100,17 +100,18 @@ scalarextend(Array *a, Array *b, Array **aa, Array **bb)
 	   aa and bb are unchanged.
 	*/
 
-	if(a->size == 1 && b->size != 1){
+	if(a->rank == 0 && b->rank != 0){
 		*aa = extend(a, b);
 		*bb = fnSame(b);
-	}else if(b->size == 1 && a->size != 1){
+	}else if(a->rank != 0 && b->rank == 0){
 		*aa = fnSame(a);
 		*bb = extend(b, a);
 	}else if(a->size == b->size && a->rank == b->rank){
 		/* Check that each dimension matches */
-		for(int i = 0; i < a->rank; i++)
+		for(int i = 0; i < a->rank; i++){
 			if(a->shape[i] != b->shape[i])
 				return 0;
+		}
 		*aa = fnSame(a);
 		*bb = fnSame(b);
 	}else