fix bug for new V2.0