Comment out for now aggresive checking