diff --git a/.travis.yml b/.travis.yml
index 9bdeb69b..daedda8c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,8 +27,9 @@ script:
   - ./ci/test_driver.sh  
   - ./ci/travis_run.py ./ci/blackbox.sh --driver=vlsim --debug 
   - ./ci/travis_run.py ./ci/blackbox.sh --driver=vlsim --cores=1 --scope --app=demo --args="-n1"
+  - ./ci/travis_run.py ./ci/blackbox.sh --driver=rtlsim --cores=2 --clusters=2
   - ./ci/travis_run.py ./ci/blackbox.sh --driver=rtlsim --cores=4 --l2cache
-  - ./ci/travis_run.py ./ci/blackbox.sh --driver=rtlsim --cores=2 --l2cache --clusters=2  
+  - ./ci/travis_run.py ./ci/blackbox.sh --driver=rtlsim --cores=2 --clusters=2 --l2cache --l3cache
   
 after_success:
   # Gather code coverage
diff --git a/hw/simulate/simulator.cpp b/hw/simulate/simulator.cpp
index 26b4a6d7..91fe3930 100644
--- a/hw/simulate/simulator.cpp
+++ b/hw/simulate/simulator.cpp
@@ -354,11 +354,7 @@ void Simulator::run() {
 }
 
 int Simulator::get_last_wb_value(int reg) const {
-  #if (NUM_CLUSTERS != 1)
-    return (int)vortex_->Vortex->genblk2__DOT__genblk1__BRA__0__KET____DOT__cluster->genblk1__BRA__0__KET____DOT__core->pipeline->commit->writeback->last_wb_value[reg];    
-  #else
-    return (int)vortex_->Vortex->genblk1__DOT__cluster->genblk1__BRA__0__KET____DOT__core->pipeline->commit->writeback->last_wb_value[reg];
-  #endif
+  return (int)vortex_->Vortex->genblk1__BRA__0__KET____DOT__cluster->genblk1__BRA__0__KET____DOT__core->pipeline->commit->writeback->last_wb_value[reg];
 }
 
 void Simulator::load_bin(const char* program_file) {