better time calculation [#64154500]