fix  to omit null