This was a corner case after the container types removal.

Change-Id: I2200b7fc2d38946403d289e62ad602a63bd1cf6e