Fix for TRQ-1528 - invalid reads.