Adding non-validate check