diff --git a/cicd_testing/basic-pgms-zafl.sh b/cicd_testing/basic-pgms-zafl.sh
index 01b6292e2275ff576faea459f0fae72113ad6625..1b6ea635321081aa9bfae292840cd0bda43d3282 100755
--- a/cicd_testing/basic-pgms-zafl.sh
+++ b/cicd_testing/basic-pgms-zafl.sh
@@ -15,7 +15,7 @@ main()
 
 	if [[ $CICD_NIGHTLY == 1 ]] ; then
 		benchmarks="tcpdump ncal bzip2 tar"
-		configs="kill_deads.rida zafl zafl_nostars zafl_opt_graph zafl_untracer zafl_untracer_critical_edges "
+		configs="kill_deads.rida zafl zafl_nostars zafl_opt_graph zafl_untracer zafl_untracer_critical_edges zafl_fix_map"
 	else
 		benchmarks="readelf touch"
 		configs="kill_deads.rida zafl zafl_opt_graph zafl_untracer_critical_edges"
diff --git a/set_env_vars b/set_env_vars
index 34c185c25ce575558da2d97f2b0d769dc5e02ffc..37ef3f1092e1c2f6eb3c876c3f9e7a10d05c28fc 100644
--- a/set_env_vars
+++ b/set_env_vars
@@ -1,3 +1,5 @@
+export ZAFL_TRACE_MAP_FIXED_ADDRESS=0x10000
+
 export ZAFL_HOME=$PWD
 if [ -z "$ZAFL_INSTALL" -o -f manifest.txt ]; then
 	if [ -z "$ZAFL_INSTALL" ]; then
diff --git a/zfuzz b/zfuzz
index f5756ffacbf60cb8968b48336079e84f68d8748c..ab9a9e6d6e1a5e0b41d958aee8aa3a6ef3f9e719 160000
--- a/zfuzz
+++ b/zfuzz
@@ -1 +1 @@
-Subproject commit f5756ffacbf60cb8968b48336079e84f68d8748c
+Subproject commit ab9a9e6d6e1a5e0b41d958aee8aa3a6ef3f9e719