Issue #2227061 by Dave Reid: Fix to subfields in a multi-value context