Quick patch to time calc