Fixed broken counting of total_elapsed