r1425 + handle arrays appropriately