Make PBB work

Everytime I merge pull requests from luztak
PBB will become unable to run
...