GBPR bug fixed