Fix after latest Check refactoring