Fixed missing object
Fixed iteration through non array