Time calc fix