fix PGB issues