GBP - G4P Connectivity Fix