Fixed the handling of no data