Fixing problems with criterion.