diff --git a/compiler/globals.py b/compiler/globals.py
index 3865a759..464bafd0 100644
--- a/compiler/globals.py
+++ b/compiler/globals.py
@@ -168,8 +168,6 @@ def init_openram(config_file, is_unit_test=True):
     from sram_factory import factory
     factory.reset()
 
-    setup_bitcell()
-    
     global OPTS
     global CHECKPOINT_OPTS
 
diff --git a/compiler/openram.py b/compiler/openram.py
index 5fec7102..63a8cfd6 100755
--- a/compiler/openram.py
+++ b/compiler/openram.py
@@ -31,8 +31,12 @@ if len(args) != 1:
 # These depend on arguments, so don't load them until now.
 import debug
 
+# Parse config file and set up all the options
 g.init_openram(config_file=args[0], is_unit_test=False)
 
+# Ensure that the right bitcell exists or use the parameterised one
+g.setup_bitcell()
+
 # Only print banner here so it's not in unit tests
 g.print_banner()