Implement Null value fixed for dates