diff --git a/src/ngx_http_lua_shdict.c b/src/ngx_http_lua_shdict.c
index cf527731..78d80462 100644
--- a/src/ngx_http_lua_shdict.c
+++ b/src/ngx_http_lua_shdict.c
@@ -253,7 +253,7 @@ ngx_http_lua_inject_shdict_api(ngx_http_lua_main_conf_t *lmcf, lua_State *L)
         lua_createtable(L, 0, lmcf->shm_zones->nelts /* nrec */);
                 /* ngx.shared */
 
-        lua_createtable(L, 0 /* narr */, 7 /* nrec */); /* shared mt */
+        lua_createtable(L, 0 /* narr */, 8 /* nrec */); /* shared mt */
 
         lua_pushcfunction(L, ngx_http_lua_shdict_get);
         lua_setfield(L, -2, "get");
@@ -276,7 +276,6 @@ ngx_http_lua_inject_shdict_api(ngx_http_lua_main_conf_t *lmcf, lua_State *L)
         lua_pushcfunction(L, ngx_http_lua_shdict_flush_all);
         lua_setfield(L, -2, "flush_all");
 
-
         lua_pushvalue(L, -1); /* shared mt mt */
         lua_setfield(L, -2, "__index"); /* shared mt */
 
@@ -474,18 +473,16 @@ ngx_http_lua_shdict_delete(lua_State *L)
 static int
 ngx_http_lua_shdict_flush_all(lua_State *L)
 {
-    ngx_time_t                  *tp;
-    ngx_msec_t                   now;
     ngx_queue_t                 *q;
     ngx_http_lua_shdict_node_t  *sd;
-    int                          flushed = 0, n;
+    int                          n;
     ngx_http_lua_shdict_ctx_t   *ctx;
     ngx_shm_zone_t              *zone;
 
     n = lua_gettop(L);
 
     if (n != 1) {
-        return luaL_error(L, "expecting 1 arguments, "
+        return luaL_error(L, "expecting 1 argument, "
                 "but seen %d", n);
     }
 
@@ -498,30 +495,22 @@ ngx_http_lua_shdict_flush_all(lua_State *L)
 
     ctx = zone->data;
 
-    tp = ngx_timeofday();
-
-    now = (ngx_msec_t) (tp->sec * 1000 + tp->msec);
-
     ngx_shmtx_lock(&ctx->shpool->mutex);
 
-    for(q = ngx_queue_last(&ctx->sh->queue);
-        q != ngx_queue_sentinel(&ctx->sh->queue);
-        q = ngx_queue_prev(q)) {
-
+    for (q = ngx_queue_head(&ctx->sh->queue);
+         q != ngx_queue_sentinel(&ctx->sh->queue);
+         q = ngx_queue_next(q))
+    {
         sd = ngx_queue_data(q, ngx_http_lua_shdict_node_t, queue);
-
-        sd->expires = now -1;
-
-        flushed++;
+        sd->expires = 1;
     }
 
     ngx_shmtx_unlock(&ctx->shpool->mutex);
 
-    return flushed++;
+    return 0;
 }
 
 
-
 static int
 ngx_http_lua_shdict_add(lua_State *L)
 {
diff --git a/t/043-shdict.t b/t/043-shdict.t
index 90d5b115..e421f795 100644
--- a/t/043-shdict.t
+++ b/t/043-shdict.t
@@ -1043,3 +1043,37 @@ GET /test
 --- response_body
 res = nil, flags = nil
 
+
+
+=== TEST 44: flush_all
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /t {
+        content_by_lua '
+            local dogs = ngx.shared.dogs
+            dogs:set("foo", 32)
+            dogs:set("bah", 10502)
+
+            local val = dogs:get("foo")
+            ngx.say(val, " ", type(val))
+            val = dogs:get("bah")
+            ngx.say(val, " ", type(val))
+
+            dogs:flush_all()
+
+            val = dogs:get("foo")
+            ngx.say(val, " ", type(val))
+            val = dogs:get("bah")
+            ngx.say(val, " ", type(val))
+
+        ';
+    }
+--- request
+GET /t
+--- response_body
+32 number
+10502 number
+nil nil
+nil nil
+
diff --git a/t/062-count.t b/t/062-count.t
index 902f017b..4b0190c1 100644
--- a/t/062-count.t
+++ b/t/062-count.t
@@ -257,3 +257,27 @@ n = 4
 --- no_error_log
 [error]
 
+
+
+=== TEST 12: shdict metatable
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua '
+            local dogs = ngx.shared.dogs
+            local mt = dogs.__index
+            local n = 0
+            for k, v in pairs(mt) do
+                n = n + 1
+            end
+            ngx.say("n = ", n)
+        ';
+    }
+--- request
+GET /test
+--- response_body
+n = 8
+--- no_error_log
+[error]
+