Time type fix