Fix NOAA integration fix for issue #21