Fix IndexOutOfBoundsException in PropertyMatcher