Fixed no Data  issue