Issue #34:  Fix total time calcuation