Date Time picker fix