improved handling of no data values