Fixed definitive_date selection