Bugfix pb popup