1.14: Added stricter array check