Fixed default/today-behavior