Fix regression with container'code #320