bugs fixing in time format