--- Fixed the GDP/NFP tracking