analytics - fixed regression due to #535