applied paranoid commit
extra paranoid commit