fix Time returns