fixed bug with CommandContainer