Properly account for single values when preceeded by multi values. Fix error in DI5