Fix up time field issue