fixing time-selection