Fix pbi package. Fixes #3274