fixed: hopefully pp bugs