[BUGFIX] Followup to DateTimePicker exchange