paranoid fixes