Added nodac check