Some modify
time bug fix