Fix container issue