diff --git a/lib/roles/http/server/fops-zip.c b/lib/roles/http/server/fops-zip.c
index 0f90446a6..015563b05 100644
--- a/lib/roles/http/server/fops-zip.c
+++ b/lib/roles/http/server/fops-zip.c
@@ -144,6 +144,9 @@ enum {
 	LWS_FZ_ERR_SEEK_COMPRESSED,
 };
 
+#define eff_size(_priv) (_priv->hdr.method == ZIP_COMPRESSION_METHOD_STORE ? \
+				  _priv->hdr.uncomp_size : _priv->hdr.comp_size)
+
 static uint16_t
 get_u16(void *p)
 {
@@ -526,11 +529,8 @@ lws_fops_zip_read(lws_fop_fd_t fd, lws_filepos_t *amount, uint8_t *buf,
 spin:
 		if (!priv->inflate.avail_in) {
 			rlen = sizeof(priv->rbuf);
-			if (rlen > priv->hdr.comp_size -
-				   (cur - priv->content_start))
-				rlen = priv->hdr.comp_size -
-				       (priv->hdr.comp_size -
-					priv->content_start);
+			if (rlen > eff_size(priv) - (cur - priv->content_start))
+				rlen = eff_size(priv) - (cur - priv->content_start);
 
 			if (priv->zip_fop_fd->fops->LWS_FOP_READ(
 					priv->zip_fop_fd, &ramount, priv->rbuf,
@@ -632,14 +632,15 @@ spin:
 
 	lwsl_info("%s: store\n", __func__);
 
-	if (len > priv->hdr.uncomp_size - (cur - priv->content_start))
-		len = priv->hdr.comp_size - (priv->hdr.comp_size -
-					     priv->content_start);
+	if (len > eff_size(priv) - cur)
+		len = eff_size(priv) - cur;
 
 	if (priv->zip_fop_fd->fops->LWS_FOP_READ(priv->zip_fop_fd,
 						 amount, buf, len))
 		return LWS_FZ_ERR_READ_CONTENT;
 
+	fd->pos += *amount;
+
 	return 0;
 }
 
diff --git a/minimal-examples/http-server/minimal-http-server-eventlib-demos/mount-origin/candide-uncompressed.zip b/minimal-examples/http-server/minimal-http-server-eventlib-demos/mount-origin/candide-uncompressed.zip
index 82cb48088..55856bce1 100644
Binary files a/minimal-examples/http-server/minimal-http-server-eventlib-demos/mount-origin/candide-uncompressed.zip and b/minimal-examples/http-server/minimal-http-server-eventlib-demos/mount-origin/candide-uncompressed.zip differ
diff --git a/test-apps/test-server.c b/test-apps/test-server.c
index 30b2fda04..af55f9fd2 100644
--- a/test-apps/test-server.c
+++ b/test-apps/test-server.c
@@ -255,11 +255,33 @@ static const struct lws_extension exts[] = {
 #endif
 
 /*
- * mount handlers for sections of the URL space
+ * mount a filesystem directory into the URL space at /
+ * point it to our /usr/share directory with our assets in
+ * stuff from here is autoserved by the library
  */
 
-static const struct lws_http_mount mount_ziptest = {
+static const struct lws_http_mount mount_ziptest_uncomm = {
 	NULL,			/* linked-list pointer to next*/
+	"/uncommziptest",		/* mountpoint in URL namespace on this vhost */
+	LOCAL_RESOURCE_PATH"/candide-uncompressed.zip",	/* handler */
+	NULL,	/* default filename if none given */
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	LWSMPRO_FILE,	/* origin points to a callback */
+	14,			/* strlen("/ziptest"), ie length of the mountpoint */
+	NULL,
+
+	{ NULL, NULL } // sentinel
+}, mount_ziptest = {
+	(struct lws_http_mount *)&mount_ziptest_uncomm,			/* linked-list pointer to next*/
 	"/ziptest",		/* mountpoint in URL namespace on this vhost */
 	LOCAL_RESOURCE_PATH"/candide.zip",	/* handler */
 	NULL,	/* default filename if none given */
@@ -278,9 +300,7 @@ static const struct lws_http_mount mount_ziptest = {
 	NULL,
 
 	{ NULL, NULL } // sentinel
-};
-
-static const struct lws_http_mount mount_post = {
+}, mount_post = {
 	(struct lws_http_mount *)&mount_ziptest, /* linked-list pointer to next*/
 	"/formtest",		/* mountpoint in URL namespace on this vhost */
 	"protocol-post-demo",	/* handler */
@@ -300,35 +320,26 @@ static const struct lws_http_mount mount_post = {
 	NULL,
 
 	{ NULL, NULL } // sentinel
+}, mount = {
+	/* .mount_next */		&mount_post,	/* linked-list "next" */
+	/* .mountpoint */		"/",		/* mountpoint URL */
+	/* .origin */			LOCAL_RESOURCE_PATH, /* serve from dir */
+	/* .def */			"test.html",	/* default filename */
+	/* .protocol */			NULL,
+	/* .cgienv */			NULL,
+	/* .extra_mimetypes */		NULL,
+	/* .interpret */		NULL,
+	/* .cgi_timeout */		0,
+	/* .cache_max_age */		0,
+	/* .auth_mask */		0,
+	/* .cache_reusable */		0,
+	/* .cache_revalidate */		0,
+	/* .cache_intermediaries */	0,
+	/* .origin_protocol */		LWSMPRO_FILE,	/* files in a dir */
+	/* .mountpoint_len */		1,		/* char count */
+	/* .basic_auth_login_file */	NULL,
 };
 
-/*
- * mount a filesystem directory into the URL space at /
- * point it to our /usr/share directory with our assets in
- * stuff from here is autoserved by the library
- */
-
-static const struct lws_http_mount mount = {
-	(struct lws_http_mount *)&mount_post,	/* linked-list pointer to next*/
-	"/",		/* mountpoint in URL namespace on this vhost */
-	LOCAL_RESOURCE_PATH, /* where to go on the filesystem for that */
-	"test.html",	/* default filename if none given */
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	0,
-	0,
-	0,
-	0,
-	0,
-	0,
-	LWSMPRO_FILE,	/* mount type is a directory in a filesystem */
-	1,		/* strlen("/"), ie length of the mountpoint */
-	NULL,
-
-	{ NULL, NULL } // sentinel
-};
 
 static const struct lws_protocol_vhost_options pvo_options = {
 	NULL,