Fix: Long and Integer types as criteria.