Time check bug fix