add handling na dates