Fixed creating new containers