diff --git a/bin/zafl.sh b/bin/zafl.sh
index 2b631c9e672cab1926f5fb11af55cd869e12f65c..73857f1b37a4eaa4df6b1dcf5ce614d57d1ab88b 100755
--- a/bin/zafl.sh
+++ b/bin/zafl.sh
@@ -214,11 +214,11 @@ parse_args()
 				shift
 				case $1 in
 					function)
-						zax_opt=" -o zax:\"--enable-context-sensitivity function\" "
+						zax_opt=" $zax_opt -o zax:\"--enable-context-sensitivity function\" "
 						shift
 					;;
 					callsite)
-						zax_opt=" -o zax:\"--enable-context-sensitivity callsite\" "
+						zax_opt=" $zax_opt -o zax:\"--enable-context-sensitivity callsite\" "
 						echo "Error: context sensitivity <callsite> currently unsupported"
 						exit 1
 					;;
diff --git a/tools/zax/zax_base.cpp b/tools/zax/zax_base.cpp
index f8737908d5a857c1d46d9b7610dec9a544b2d867..2fc3310d364c8dfdaae8e0141503fca5a72f5878 100644
--- a/tools/zax/zax_base.cpp
+++ b/tools/zax/zax_base.cpp
@@ -1276,7 +1276,7 @@ int ZaxBase_t::execute()
 		if (getContextSensitivity() != ContextSensitivity_None)
 		{
 			// this handles inserting the calling context sensitivity value
-			// at entry and exits of functions (todo: or at call sites a la Angora)
+			// at entry and exits of functions
  			getFileIR()->assembleRegistry();
 		 	getFileIR()->setBaseIDS();
 			auto cs_cfg=ControlFlowGraph_t::factory(f);