diff --git a/lib/rfs.js b/lib/rfs.js
index 3cb3b693..e61d2f58 100644
--- a/lib/rfs.js
+++ b/lib/rfs.js
@@ -73,4 +73,12 @@ function Store(opt){
 	return store;
 }
 
+var Gun = (typeof window !== "undefined")? window.Gun : require('../gun');
+Gun.on('create', function(root){
+	this.to.next(root);
+	var opt = root.opt;
+	if(opt.rfs === false){ return }
+	opt.store = opt.store || (!Gun.window && Store(opt));
+});
+
 module.exports = Store;
\ No newline at end of file
diff --git a/lib/server.js b/lib/server.js
index 31da4b8a..0ded525b 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -12,6 +12,7 @@
 	require('../nts');
 	require('./store');
 	require('./rs3');
+	require('./rfs');
 	require('./wire');
 	try{require('../sea');}catch(e){}
 	try{require('../axe');}catch(e){}
diff --git a/lib/store.js b/lib/store.js
index a4af2ad9..56940957 100644
--- a/lib/store.js
+++ b/lib/store.js
@@ -7,10 +7,8 @@ Gun.on('create', function(root){
     if(false === opt.radisk){ return }
     var Radisk = (Gun.window && Gun.window.Radisk) || require('./radisk');
     var Radix = Radisk.Radix;
-    var ST = 0;
-    // TODO: BUG! For RN storage, RN does not like the following require:
-    opt.store = opt.store || (!Gun.window && require('./rfs')(opt));
     var dare = Radisk(opt), esc = String.fromCharCode(27);
+    var ST = 0;
  
     root.on('put', function(msg){
         this.to.next(msg);