Fix irregular criteria