Corrected bugs with time processing