correction for time conditional bug
Merge branch 'time-condition'