fix PB conversion issues