fixes #583 (aka. "son, we heard you like containers so we put containers inside your containers") -- duly fixed