diff --git a/src/base/base_context_cracking.h b/src/base/base_context_cracking.h
index bac701dd..ba452a5a 100644
--- a/src/base/base_context_cracking.h
+++ b/src/base/base_context_cracking.h
@@ -159,7 +159,7 @@
 #endif
 
 #if !defined(BUILD_VERSION_PATCH)
-# define BUILD_VERSION_PATCH 14
+# define BUILD_VERSION_PATCH 15
 #endif
 
 #define BUILD_VERSION_STRING_LITERAL Stringify(BUILD_VERSION_MAJOR) "." Stringify(BUILD_VERSION_MINOR) "." Stringify(BUILD_VERSION_PATCH)
diff --git a/src/raddbg/raddbg_views.c b/src/raddbg/raddbg_views.c
index a3d6577e..c41cc6f8 100644
--- a/src/raddbg/raddbg_views.c
+++ b/src/raddbg/raddbg_views.c
@@ -4289,7 +4289,7 @@ RD_VIEW_UI_FUNCTION_DEF(disasm)
   //
   B32 auto_selected = 0;
   E_Space auto_space = {0};
-  if(eval.space.kind == E_SpaceKind_Null)
+  if(eval.expr == &e_expr_nil)
   {
     if(dv->temp_look_vaddr != 0 && dv->temp_look_run_gen == ctrl_run_gen())
     {
@@ -4344,8 +4344,8 @@ RD_VIEW_UI_FUNCTION_DEF(disasm)
   {
     space = auto_space;
   }
-  Rng1U64 range = {0}; // TODO(rjf): @cfg rd_range_from_eval_params(eval, params);
-  Arch arch = Arch_Null; // TODO(rjf): @cfg rd_arch_from_eval_params(eval, params);
+  Rng1U64 range = rd_range_from_eval_tag(eval, tag);
+  Arch arch = rd_arch_from_eval_tag(eval, tag);
   CTRL_Entity *space_entity = rd_ctrl_entity_from_eval_space(space);
   CTRL_Entity *dasm_module = &ctrl_entity_nil;
   DI_Key dbgi_key = {0};