1.2.1 - use safe array checking