@@ -426,11 +426,11 @@
     (let loop ((count 0))
       ;; Use this opportunity to sync the inmemdb to db
       (let ((start-time (current-milliseconds))
 	    (sync-time  #f)
 	    (rem-time   #f))
-	(if *inmemdb* (db:sync-to *inmemdb* *db*))
+	(if *inmemdb* (db:sync-tables (db:tbls *inmemdb*) *inmemdb* *db*)) ;; (db:sync-to *inmemdb* *db*))
 	(set! sync-time  (- (current-milliseconds) start-time))
 	(debug:print 0 "SYNC: time= " sync-time)
 	(set! rem-time (quotient (- 4000 sync-time) 1000))
 	(if (and (< rem-time 4)
 		 (> rem-time 0))
@@ -471,11 +471,11 @@
 	    (loop 0))
 	  (begin
 	    (debug:print-info 0 "Starting to shutdown the server.")
 	    ;; need to delete only *my* server entry (future use)
 	    (set! *time-to-exit* #t)
-	    (if *inmemdb* (db:sync-to *inmemdb* *db*))
+	    (if *inmemdb* (db:sync-tables (db:tbls *inmemdb*) *inmemdb* *db*)) ;; (db:sync-to *inmemdb* *db*))
 	    (open-run-close tasks:server-deregister-self tasks:open-db (get-host-name))
 	    (thread-sleep! 1)
 	    (debug:print-info 0 "Max cached queries was    " *max-cache-size*)
 	    (debug:print-info 0 "Number of cached writes   " *number-of-writes*)
 	    (debug:print-info 0 "Average cached write time "
@@ -518,11 +518,11 @@
 		   (th3 (make-thread http-transport:keep-running "Keep running")))
 ;;		   (th1 (make-thread server:write-queue-handler  "write queue")))
 	      (set! *cache-on* #t)
 	      (set! *db*       (open-db))
 	      (set! *inmemdb*  (open-in-mem-db))
-	      (db:sync-to *db* *inmemdb*)
+	      (db:sync-tables (db:tbls *db*) *db* *inmemdb*) ;; (db:sync-to *db* *inmemdb*)
 
 	      (thread-start! th2)
 	      (thread-start! th3)
 	      ;; (thread-start! th1)
 	      (set! *didsomething* #t)