add fix on time elapsed