--- ray/src/util/rmatrix.h	2014/08/02 17:10:43	2.4
+++ ray/src/util/rmatrix.h	2014/08/27 13:33:47	2.5
@@ -1,4 +1,4 @@
-/* RCSid $Id: rmatrix.h,v 2.4 2014/08/02 17:10:43 greg Exp $ */
+/* RCSid $Id: rmatrix.h,v 2.5 2014/08/27 13:33:47 greg Exp $ */
 /*
  * Header file for general matrix routines.
  */
@@ -20,7 +20,7 @@ typedef struct {
 	double	mtx[1];			/* extends struct */
 } RMATRIX;
 
-#define rmx_lval(rm,r,c,i)	(rm)->mtx[((i)*(rm)->nrows+(r))*(rm)->ncols+(c)]
+#define rmx_lval(rm,r,c,i)	(rm)->mtx[(i)+(rm)->ncomp*((c)+(rm)->ncols*(r))]
 
 /* Allocate a nr x nc matrix with n components */
 extern RMATRIX	*rmx_alloc(int nr, int nc, int n);