container related bug fix