diff --git a/ChangeLog.txt b/ChangeLog.txt
index f95d6fe0..6b71ac2a 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -7,9 +7,12 @@ because OS X does not provide the le32toh() and htole32() functions.)
 [2] The non-SIMD RGB565 color conversion code did not work correctly on big
 endian machines.  This has been fixed.
 
-[3] Fixed an issue in tjPlaneSizeYUV() whereby it was erroneously returning 1
+[3] Fixed an issue in tjPlaneSizeYUV() whereby it would erroneously return 1
 instead of -1 if componentID was > 0 and subsamp was TJSAMP_GRAY.
 
+[3] Fixed an issue in tjBufSizeYUV2() wherby it would erroneously return 0
+instead of -1 if width was < 1.
+
 
 1.3.90 (1.4 beta1)
 ==================
diff --git a/turbojpeg.c b/turbojpeg.c
index a5ca3194..06cca665 100644
--- a/turbojpeg.c
+++ b/turbojpeg.c
@@ -613,9 +613,10 @@ DLLEXPORT unsigned long DLLCALL tjBufSizeYUV2(int width, int pad, int height,
 	nc=(subsamp==TJSAMP_GRAY? 1:3);
 	for(i=0; i<nc; i++)
 	{
-		int stride=PAD(tjPlaneWidth(i, width, subsamp), pad);
+		int pw=tjPlaneWidth(i, width, subsamp);
+		int stride=PAD(pw, pad);
 		int ph=tjPlaneHeight(i, height, subsamp);
-		if(stride<0 || ph<0) return -1;
+		if(pw<0 || ph<0) return -1;
 		else retval+=stride*ph;
 	}