Index: openacs-4/packages/boomerang/tcl/boomerang-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/boomerang/tcl/boomerang-procs.tcl,v
diff -u -N -r1.13.2.27 -r1.13.2.28
--- openacs-4/packages/boomerang/tcl/boomerang-procs.tcl	13 Oct 2022 09:01:49 -0000	1.13.2.27
+++ openacs-4/packages/boomerang/tcl/boomerang-procs.tcl	14 Oct 2022 09:23:52 -0000	1.13.2.28
@@ -207,10 +207,15 @@
                     dict set entries nt_response_time [expr {[dict get $entries nt_res_end] - [dict get $entries nt_res_st]}]
 
                     if {![dict exists $entries nt_load_end]} {
-                        if {[dict exists $entries nt_domcontloaded_end]} {
-                            dict set entries nt_load_end [dict get $entries nt_domcontloaded_end]
-                            ns_log warning "boomerang: substitute 'nt_load_end' by 'nt_domcontloaded_end'"
-                        } else {
+                        set alternative_ends {nt_domcontloaded_end nt_first_paint}
+                        foreach var $alternative_ends {
+                            if {[dict exists $entries $var]} {
+                                dict set entries nt_load_end [dict get $entries $var]
+                                ns_log warning "boomerang: substitute 'nt_load_end' by '$var'"
+                                break
+                            }
+                        }
+                        if {![dict exists $entries nt_load_end]} {
                             ns_log warning "boomerang: no value for 'nt_load_end' in dict [lsort [dict keys $entries]]"
                         }
                     }