fixed national data bug