fixed some container trouble