Support time-1.5, fixes #35