Time expression bugfix