Fix to make criteria non-sensitive