Added paranoid check