Fix/pretty time format problem