Fix bug in DateSelector