Attempt to fix indexing breaking on invalid model attributes