Update for compatibility with new criterion