update time bug fix
merge