Handle odd containers better