fix 'container' used in 'choice' statement