Fix date selection