Fixing object initialization bug in EnhancedDatePicker