Fixes Array Based Attribute Indexes

My bad... testing oversight here when I rewrote this. Now array attributes should re-index properly. 

Fixes #620