fix issue with 'container' numbering