Fix #137: gets rid of paranoid mode