G4P/GBP Upload Fix