Fix not being paranoid enough