Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -145,12 +145,12 @@
 (define (db:get-subdb dbstruct run-id)
   (let* ((res (dbfile:get-subdb dbstruct run-id)))
     (if res
 	res
 	(let* ((newsubdb (make-dbr:subdb)))
-	  (db:open-db newsubdb run-id areapath: (dbr:dbstruct-areapath dbstruct) do-sync: #t)
-	  (hash-table-set! (dbr:dbstruct-subdbs dbstruct) (dbfile:run-id->key run-id) newsubdb)
+	  (dbfile:set-subdb dbstruct run-id newsubdb)
+	  (db:open-db dbstruct run-id areapath: (dbr:dbstruct-areapath dbstruct) do-sync: #t)
 	  newsubdb))))
 
 ;; Get/open a database
 ;;    if run-id => get run specific db
 ;;    if #f     => get main db
@@ -313,12 +313,13 @@
          (exn () (debug:print 0 *default-log-port* "ERROR: Unknown error with database " fname " message: " ((condition-property-accessor 'exn 'message) exn))))
 	)))
 
 ;; This routine creates the db if not already present. It is only called if the db is not already opened
 ;;
-(define (db:open-db subdb run-id #!key (areapath #f)(do-sync #t)) ;; TODO: actually use areapath
-  (let* ((tmpdb-stack (dbr:subdb-dbstack subdb))) ;; RA => Returns the first reference in dbstruct
+(define (db:open-db dbstruct run-id #!key (areapath #f)(do-sync #t))
+  (let* ((subdb       (dbfile:get-subdb dbstruct run-id))
+	 (tmpdb-stack (dbr:subdb-dbstack subdb))) 
     (if (stack? tmpdb-stack)
 	(db:get-db tmpdb-stack run-id) ;; get previously opened db (will create new db handle if all in the stack are already used
         (let* ((max-stale-tmp (configf:lookup-number *configdat* "server" "filling-db-max-stale-seconds" default: 10))
                (dbpath       (db:dbfile-path))      ;; path to tmp db area
 	       (dbname       (db:run-id->dbname run-id))

Index: dbfile.scm
==================================================================
--- dbfile.scm
+++ dbfile.scm
@@ -186,10 +186,13 @@
 
 (define (dbfile:get-subdb dbstruct run-id)
   (let* ((dbfname (db:run-id->dbname run-id)))
     (hash-table-ref/default (dbr:dbstruct-subdbs dbstruct) dbfname #f)))
 
+(define (dbfile:set-subdb dbstruct run-id subdb)
+  (hash-table-set! (dbr:dbstruct-subdbs dbstruct) (db:run-id->dbname run-id) subdb))
+
 ;; Get/open a database
 ;;    if run-id => get run specific db
 ;;    if #f     => get main db
 ;;    if run-id is a string treat it as a filename
 ;;    if db already open - return inmem

Index: tests/simplerun/thebeginning.scm
==================================================================
--- tests/simplerun/thebeginning.scm
+++ tests/simplerun/thebeginning.scm
@@ -4,9 +4,9 @@
 
 (test #f #t (dbr:dbstruct? (db:setup #t)))
 (define dbstruct *dbstruct-dbs*)
 (test #f #f (dbfile:get-subdb dbstruct #f)) ;; get main.db (never opened yet)
 (test #f #f (dbfile:get-subdb dbstruct 1))  ;; get 1.db
-
+(test #f #t (hash-table? (dbr:dbstruct-subdbs dbstruct) ))
 (test #f #f (db:get-subdb dbstruct 1))
 
-(test #f #f (stack? (dbr:subdb-dbstack subdb)))
+;; (test #f #f (stack? (dbr:subdb-dbstack subdb)))