Issue with nullable DateTime fixed