yang fix for solving container and choice problem