Fixed incorrent measurement index to values mapping