#107 setting client container if needed