MPS-15398 - accomodated for expected type, if applicable