PROV-573 Fix for indexing errors