modify bug for V18