NONFI Upload Re-Fix