Fixed indexing issue EPR:378014