[master] time code fix