Bugfix for PPI