Be more robust with elapsed time counter