diff --git a/intern/cycles/kernel/shaders/node_brick_texture.osl b/intern/cycles/kernel/shaders/node_brick_texture.osl
index 509b4f2883b..aa9742fb277 100644
--- a/intern/cycles/kernel/shaders/node_brick_texture.osl
+++ b/intern/cycles/kernel/shaders/node_brick_texture.osl
@@ -41,8 +41,8 @@ float brick(point p, float mortar_size, float bias,
 	rownum = (int)floor(p[1] / row_height);
 	
 	if (offset_frequency && squash_frequency) {
-		brick_width *= ((int)(rownum) % squash_frequency) ? 1.0 : squash_amount;                /* squash */
-		offset       = ((int)(rownum) % offset_frequency) ? 0 : (brick_width * offset_amount);  /* offset */
+		brick_width *= (rownum % squash_frequency) ? 1.0 : squash_amount;                /* squash */
+		offset       = (rownum % offset_frequency) ? 0.0 : (brick_width * offset_amount);  /* offset */
 	}
 
 	bricknum = (int)floor((p[0] + offset) / brick_width);
diff --git a/intern/cycles/kernel/svm/svm_brick.h b/intern/cycles/kernel/svm/svm_brick.h
index 43dc1a2f295..c44a4740cca 100644
--- a/intern/cycles/kernel/svm/svm_brick.h
+++ b/intern/cycles/kernel/svm/svm_brick.h
@@ -41,8 +41,8 @@ __device_noinline float2 svm_brick(float3 p, float scale, float mortar_size, flo
 	rownum = floor_to_int(p.y / row_height);
 	
 	if(offset_frequency && squash_frequency) {
-		brick_width *= ((int)(rownum) % squash_frequency ) ? 1.0f : squash_amount; /* squash */
-		offset = ((int)(rownum) % offset_frequency ) ? 0 : (brick_width*offset_amount); /* offset */
+		brick_width *= (rownum % squash_frequency) ? 1.0f : squash_amount; /* squash */
+		offset = (rownum % offset_frequency) ? 0.0f : (brick_width*offset_amount); /* offset */
 	}
 
 	bricknum = floor_to_int((p.x+offset) / brick_width);