Fix typed criteria